|#1154| Renaming and moving methods in approve R&R controller