removed more mouse_ prefixes