refacoring names a bit