Rename lib & classes