Changes to reflect naming conventions of github master