Make variable names in Resources more conventional