setup names changed and unified