refacted the names a bit