Update and rename Fetch Functions to Data Fetch functions