Lots of naming improvements