Lafferty: Updated namespace

got rid of namespace references