Changed the use of define-alias to java-import in several files.