Some renaming and setup for sleekness