fixed orm mapping; check singular / plural entity names in annotations