Fixed object and function naming.