Fixed visibility typos & added namespace option