Make attribute handling and name creation clearer
Make attribute handling and name creation clearer

[#114101317](https://www.pivotaltracker.com/story/show/114101317)

Signed-off-by: Felix Riegger <9c2aa7530239a330bbac6ac4f56e0946781dfd29@sap.com>

barthy1/bosh,barthy1/bosh,barthy1/bosh,barthy1/bosh