Rename methods, and cleanup.