renaming and putting into namespace