Changed naming format of model constants and fixed fallout.