Changed filename conventions to match automatically-generated files