Fixed Conventions

I had bad ones