refactor
fixup rename bug