renaming and error handling