diff --git a/src/database/attributes.go b/src/database/attributes.go
index 0049b6b..a279b35 100644
--- a/src/database/attributes.go
+++ b/src/database/attributes.go
@@ -40,32 +40,32 @@ const (
 	AttributeRatingWarning = 2
 	AttributeRatingBad     = 3
 
-	AttributeRiskPreventionSystem  = "auripr"
-	AttributeKYCForSomeFeatures    = "kmausfe"
-	AttributeKYCIfObligedByLaw     = "koblainpo"
-	AttributeCustodialWallet       = "cuwa"
-	AttributeAccountNeeded         = "acneus"
-	AttributePrivateSourceCode     = "socopr"
-	AttributeNoCustomerSupport     = "nocusu"
-	AttributeBlockFundsIfFlagged   = "blfuflsu"
-	AttributeUnclearRefundPolicy   = "unrepo"
-	AttributeSellerWalletCustodial = "sewacu"
-	AttributeRefundRequiresKYC     = "repedi"
-	AttributeToSNotScrapable       = "tonosc"
-	AttributePartnersMayEnforceKYC = "pamakyc"
-	AttributeNonCustodialWallet    = "nocuwa"
-	AttributeOpenSource            = "ossli"
-	AttributeP2P                   = "p2p"
-	AttributeNoRegistrationNeeded  = "norene"
-	AttributeNoPersonalInfoNeeded  = "nopine"
-	AttributeStrictNoKYCPolicy     = "stnokyc"
-	AttributeRefundNoKYC           = "refnokyc"
-	AttributeStrictNoLogPolicy     = "stnolog"
-	AttributeMobileAppAvailable    = "moapp"
-	AttributeNoJavaScriptNeeded    = "nojs"
-	AttributeTelegramBotAvailable  = "tebot"
+	AttributeAccountNeeded         = "account-needed"
 	AttributeAPIAvailable          = "api"
-	AttributeJavaScriptNeeded      = "yesjs"
+	AttributeBlockFundsIfFlagged   = "blocks-if-flagged"
+	AttributeCustodialWallet       = "custodial-wallet"
+	AttributeJavaScriptNeeded      = "needs-js"
+	AttributeKYCForSomeFeatures    = "kyc-features"
+	AttributeKYCIfObligedByLaw     = "kyc-law"
+	AttributeMobileAppAvailable    = "mobile-app"
+	AttributeNoCustomerSupport     = "no-customer-support"
+	AttributeNoJavaScriptNeeded    = "no-js"
+	AttributeNonCustodialWallet    = "non-custodial"
+	AttributeNoPersonalInfoNeeded  = "no-personal-info"
+	AttributeNoRegistrationNeeded  = "no-registration"
+	AttributeOpenSource            = "open-source"
+	AttributeP2P                   = "p2p"
+	AttributePartnersMayEnforceKYC = "partners-kyc"
+	AttributePrivateSourceCode     = "private-code"
+	AttributeRefundNoKYC           = "refunds-no-kyc"
+	AttributeRefundRequiresKYC     = "refunds-kyc"
+	AttributeRiskPreventionSystem  = "risk-prevention-system"
+	AttributeSellerWalletCustodial = "seller-wallet-custodial"
+	AttributeStrictNoKYCPolicy     = "strict-no-kyc"
+	AttributeStrictNoLogPolicy     = "strict-no-log"
+	AttributeTelegramBotAvailable  = "telegram-bot"
+	AttributeToSNotScrapable       = "tos-not-scrapable"
+	AttributeUnclearRefundPolicy   = "unclear-refunds"
 )
 
 var ServiceAttributes = AttributeMap{
@@ -169,7 +169,7 @@ var ServiceAttributes = AttributeMap{
 		},
 
 		AttributeOpenSource: {
-			Title:       "The service is open source",
+			Title:       "Open source code",
 			Description: "The source code of the service is publicly available. This means that the service can be audited by the community. This is not necessarily good, but it is something to keep in mind.",
 			Rating:      AttributeRatingGood,
 			ID:          AttributeOpenSource,