Improve wording and update naming