Merge "Rename Kotlin util files to not include the Kt suffix"