cleaning up library naming for use in other libraries