[WIP] Simpler library name