Fix names and redeclares