Removed TextUtils usage. Fixed namespace generation