minor naming conventions changes