renames and fixes because john is a stoopidhead