Update lib
Actually implement custom names