I agree that the H is a bit arbitrary and ugly. I don't know that we can afford to ignore the fact that our entities are handled by Hibernate since we have to ensure they are persisted, and make sure we avoid issues with lazy loading. I'm in favour of removing the H, but we'd better do it consistently to avoid confusion, and we might want a suffix that tells us that a class is an entity so that we know the types of issues we need to avoid (e.g. TransMemoryEntity).