Change var names to XF

Signed-off-by: Pablo Lezaeta <prflr88@gmail.com>