added netbeans support and fixed a name conflict