Minor rename/format