[TASK] Some renaming.

Also disables be module till full support.