Various method name changes to make it clear what they do