More design improvement and some renames and clean up