r12443: Forgot to rename two files