Fix name normalization (issue #126)

Name normalization should differentiate between class names and property
names to avoid name collisions and resulted compilation errors