Fix changed namespace detection in L5
Cleaning things up a bit
Merge
Make test green