Fix naming bug; need self reference...