LPS-40966 Prepare for dynamic axis
LPS-40966 Use better var name