Name fixes for eclipse