Fixed naming (long methods)