Changed the syntax used and updates files to reflect new name