Updated files to match more closely with common practice.