rename and @glan updates