Some re-arranging and re-naming