[Nick and I] refactored the files and field names associated with sub requirements