Rename helper. Add keywords