Modifications to reflect namespace change