JR: Fixed the correct files