some minor rename changes