Renaming for clarity (however it's too wordy now)