update to name convention