Make internals final/abstract as possible, fix names in text package and internals