Updated file names to work with RCM