Some minor re-naming