Update OpenOffice for new naming conventions
Merge pull request #1590 from Cottser/openoffice

Update OpenOffice for new naming conventions