Renaming methods and exceptions to conform to spec