Revises forms for all variables to match naming conventions