Namespace renamed
Functions needed for linking implemented