removed name conflict warning
removed name conflict warning

AMICI-developer/AMICI,AMICI-developer/AMICI,AMICI-developer/AMICI,FFroehlich/AMICI,FFroehlich/AMICI,paulstapor/AMICI,FFroehlich/AMICI,paulstapor/AMICI,AMICI-developer/AMICI,paulstapor/AMICI,FFroehlich/AMICI,paulstapor/AMICI