Cleanup + reserved keywords renaming