offset name refactor

@gknisely