Clean up variable name/short name conversion