From two to just one namespace