Rename of operations and tidyup