renaming stuff, adding element shortcuts