MANTA-24 simple name updates
MANTA-24 update headers
MANTA-24 refresh formatting