Revert "Use base-url instead of baseurl"

This reverts commit 3d37e27e7d67d12f7fe5f37378d0d8dcbef7b9b3.