Final Cleanup and Rename