Further clean-up of naming