Changed file names to use optKind.