Change names and make more usable