Renames and comments
Fix unreserved keywords