You're right -- tons of room for naming improvement.