Rename storage namespace and constitutuents