Fixed the mapping in emf support gen