Rename to avoid confusing stuffs
Do some achitecture bits and bobs