Consistent naming
Time constraint copy-and-paste errors
Added reserved words