Fixed some ambiguities in library design.