fix names to make them more sensible