Fixed object and method names.