Changes regarding to naming and stuff