[cleanup] restructing attributes and namings