Rename based on @thabach comments