Some convention modifications was done.
Order of stages forced by naming convention.