Builder: case sensitivity fixes.