Adjusted name scheme after discussions and review