Filename conventions changed to reflect applied modifications to files