fixed spelling issue and entity mapping