Fix concatenation issue; path renaming