Fixing little naming convention errors