more renaming, fixed syntax error