Refactoring and renames

Make the DartDoc output cleaner