clean up control names for consistent style