Refactor name of Type.java