Fixed path and naming

Here are the fixes