did some name reformatting to keep things more standard