More minor rename, other fixes