Further refactoring due to entity attribute naming convention changes.