Namespace changes

Changed 'query' to 'input'. I like input.