Bug fix; Some renaming