Internalize Stringes classes, fix namespace names