Renamed id-prefixed classes to more descriptive ones