Did some renaming for the static vars

sdfsd