[TASK] Simplify propertyName-creation