Renaming variables prior to making changes to feedback detection
Further variable name changes for feedback detection and consequential database changes