Clean up and some name changes