Remove redundant prefix from variable name