Refactors due to cieloz renaming