fix names to be more standard