Fixed up various problems with naming