removed redundant endpoint_ from host variable names...