Fixed some namespace in annotations