Better library naming