name mapping for nested classes now working and tested