clean up gem, fix naming inconsistencies