attempt at renaming, fixing errors