Some ranaming and a fix for returned path