Consistent naming
Adjust to new dir layout (just for local editting)