Library - step one and half

More renames, refactors