Updated file names/resources etc