Fixes

-Convention changes