Minor naming changes for coherency, fixed syntax error