fix name convention