Minor name refactor