Entity annotations and renaming model (pluralization added in most cases)