tuning names up for readability