variable/types rename