Started renaming for the changed spec
Continue updating