Fixed names

fixed some names and pathing