Adjustments

Field names, variables, standards, etc.