diff --git a/internal/btpcli/facade_accounts_subscription.go b/internal/btpcli/facade_accounts_subscription.go
index b427e219..8657718d 100644
--- a/internal/btpcli/facade_accounts_subscription.go
+++ b/internal/btpcli/facade_accounts_subscription.go
@@ -19,7 +19,7 @@ func (f *accountsSubscriptionFacade) getCommand() string {
 }
 
 func (f *accountsSubscriptionFacade) List(ctx context.Context, subaccountId string) ([]saas_manager_service.EntitledApplicationsResponseObject, CommandResponse, error) {
-	type wrapper struct { // FIXME should be in types package
+	type wrapper struct { // TODO should be in types package
 		Applications []saas_manager_service.EntitledApplicationsResponseObject `json:"applications"`
 	}
 
diff --git a/internal/btpcli/types/xsuaa_authz/model_user_reference.go b/internal/btpcli/types/xsuaa_authz/model_user_reference.go
index 0e620472..e9bd8162 100644
--- a/internal/btpcli/types/xsuaa_authz/model_user_reference.go
+++ b/internal/btpcli/types/xsuaa_authz/model_user_reference.go
@@ -17,7 +17,7 @@ type UserReference struct {
 	FamilyName string `json:"familyName,omitempty"`
 	Origin     string `json:"origin,omitempty"`
 
-	// FIXME additional fields not mentioned in the swagger file
+	// TODO additional fields not mentioned in the swagger file
 	Verified                   bool     `json:"verified,omitempty"`
 	LegacyVerificationBehavior bool     `json:"legacyVerificationBehavior,omitempty"`
 	PasswordChangeRequired     bool     `json:"passwordChangeRequired,omitempty"`
diff --git a/internal/tfutils/tfutils.go b/internal/tfutils/tfutils.go
index 6d50ac5c..be5e38e4 100644
--- a/internal/tfutils/tfutils.go
+++ b/internal/tfutils/tfutils.go
@@ -96,7 +96,7 @@ func ToBTPCLIParamsMap(a any) (map[string]string, error) {
 			}
 
 			value = field.Elem().Interface().(string)
-		case "map[string][]string": // FIXME would be nice to have `enodethisasjson` tag, instead of an explicit typemapping
+		case "map[string][]string": // TODO would be nice to have `encodethisasjson` tag, instead of an explicit type mapping
 
 			if field.IsNil() {
 				continue