Refactor proc names