Fixer base

Just love to remove duplicated code
This renaming is wrong.