Cleanup naming in library