Removed remaining ORM names.