Updated to current filename conventions